diff --git a/hifi/xaf/host-apf/Android.mk b/hifi/xaf/host-apf/Android.mk
index 28e7101..2bce8cf 100644
--- a/hifi/xaf/host-apf/Android.mk
+++ b/hifi/xaf/host-apf/Android.mk
@@ -4,6 +4,7 @@
 ################################################################################
 
 include $(CLEAR_VARS)
+LOCAL_VENDOR_MODULE := true
 common_C_INCLUDES := 	\
         $(LOCAL_PATH)/include	\
         $(LOCAL_PATH)/include/audio		\
@@ -25,7 +26,9 @@
 
 C_FLAGS := -DXF_TRACE=0 -Wall -Werror -Wno-everything
 
+LOCAL_SHARED_LIBRARIES := liblog
 LOCAL_C_INCLUDES := $(common_C_INCLUDES)
+LOCAL_C_INCLUDES += external/expat/lib
 LOCAL_CFLAGS := $(C_FLAGS)
 LOCAL_MODULE := libxtensa_proxy
 LOCAL_MODULE_TAGS := optional
@@ -36,6 +39,7 @@
 # xaf-dec-test: fileinput->ogg/pcm decoder->speaker output
 ################################################################################
 include $(CLEAR_VARS)
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE := xaf-dec-test
 
 LOCAL_SRC_FILES := \
@@ -52,6 +56,7 @@
 # xaf-dec-mix-test: fileinput->ogg orpcm decoder->Mixer->speaker output
 ################################################################################
 include $(CLEAR_VARS)
+LOCAL_VENDOR_MODULE := true
 LOCAL_MODULE := xaf-dec-mix-test
 
 LOCAL_SRC_FILES := \
diff --git a/hifi/xaf/host-apf/include/os/android/xf-osal.h b/hifi/xaf/host-apf/include/os/android/xf-osal.h
index 7d2f5a9..6286405 100644
--- a/hifi/xaf/host-apf/include/os/android/xf-osal.h
+++ b/hifi/xaf/host-apf/include/os/android/xf-osal.h
@@ -34,7 +34,7 @@
 #include <sys/mman.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 /*******************************************************************************
  * Tracing primitive
diff --git a/hifi/xaf/host-apf/utest/xaf-dec-test.c b/hifi/xaf/host-apf/utest/xaf-dec-test.c
index 7e5d050..b83a0f9 100644
--- a/hifi/xaf/host-apf/utest/xaf-dec-test.c
+++ b/hifi/xaf/host-apf/utest/xaf-dec-test.c
@@ -253,9 +253,9 @@
        TRACE(ERROR, _x("Failed to open '%s': %d"), argv[1], errno);
        exit(-1);
     }
-    if ((ofp = fopen("dec-out.pcm", "wb")) == NULL)
+    if ((ofp = fopen("/data/dec-out.pcm", "wb")) == NULL)
     {
-       TRACE(ERROR, _x("Failed to open '%s': %d"), "dec-out.pcm", errno);
+       TRACE(ERROR, _x("Failed to open '%s': %d"), "/data/dec-out.pcm", errno);
        exit(-1);
     }
     p_input  = fp;
diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk
index 319f31a..814dd64 100644
--- a/hikey960/device-hikey960.mk
+++ b/hikey960/device-hikey960.mk
@@ -37,7 +37,8 @@
 
 # Copy hifi firmware
 PRODUCT_COPY_FILES += \
-	device/linaro/hikey/hifi/firmware/hifi-hikey960.img:$(TARGET_COPY_OUT_VENDOR)/firmware/hifi/hifi.img
+	device/linaro/hikey/hifi/firmware/hifi-hikey960.img:$(TARGET_COPY_OUT_VENDOR)/firmware/hifi/hifi.img \
+	device/linaro/hikey/hifi/xaf/host-apf/tools/dhifimesg:/vendor/bin/dhifimesg
 
 
 # Build HiKey960 HDMI audio HAL. Experimental only may not work. FIXME